clean up and sync with master