Remove NO_STAGE support