cleaning up from messy merge