Clean up

Remove dead code from refactor