clean up and fix last merge