more cleanup after bad merge