possible simplification?
remove dead code