Removal of some stuff