Remove a "get"
Remove dead code
Fix a bad merge that broke some tests