Remove unneeded crap. (Technically a 'code cleanup' but F U)