[ubuntu] double software centre

I've upgraded to Ubuntu 16.04 and two things have happened.

1) I don't seem to have the updated icon for the new ubuntu software
2) I have the new ubuntu software along with the old software centre which is actually functional.

I was wondering if anyone has this same issue and knows how to resolve it. Don't really care if 1 gets fixed just more interested in 2).

Other then that it seems to work well apart from HDMI only working after I log in but that's probably because the laptop I'm using is AMD.