Removed old cleanup code