Housekeeping: Remove some unneeded stuff
WIP