Cleaning up to sync with master