More stage cleanup