Cleaning up some extra stuff