Removing more accesory stuff, trying to get a clean version