Fixing stuff that's just not needed anymore

Removing crap