Remove suspend code by default