minor change, removing some dead code