more cleanup from mis-merged code