Remove dead code
Normalize naming scheme