change some names
Remove dead code