stripped out old legacy code