Added simple cleanup