remove noReturn adapter fn, consolidate files