clean up, get rid of debug code