clean up debug code and stray files from last commit
silence compiler warnings