Cleaning up unneeded stuff