Removing uneeded stuff