clean up to switch branch