Added a cleanup phase to these features