Remove some #ifs