Refactoring prior to doing exit delete