Added 'resource cleanup' ability