BalajiN | Fixing cleanup steps