clean up of cups, moving to 1.7 series