Cleaning up more stuff