Removed cleanup