Yup, that looks like the only problem! Sometimes, it takes me an hour to get rid of everything, because I first start off my figuring out what everything is, then removing and testing. If everything goes well, then you're all set! I actually did one by remote assistance on Friday night!