remove ifdefs around always-on code