removed commented out old function