Adding back cleanup