Removed the old code