remove some old commented out defs
just temporary before reorg for the shared lib build