Remove addons stuff and more theme stuff