Cleaning up unneeded things