Clean up some extra stuff