Removal of unneeded stuff