removed some dead code revealed by code coverage analysis