Added cleaning up