[SP-149] Tightened up cleanup process