Remove old impl commented out