Removed the cleanup calls!