Removes other problem bits of code