remove dead code
make naming more consistent