Can these commented out functions be removed?