removed a few dead code spots