cleanup pointless ifdefs, simplify