Removed the last of old code