Removed extra old code