Remove some cuts in the compiler that are no longer required