Remove extra old code