Removing some unneeded stuff