Removed commented out old function