Cleaning up a few unnecessary things