commented out old legacy code