remove unused ifdefs
removing ifdefs, defines
rm stray