remove compatibility code / ifdefs