Clean up

Remove dead code from refactor
clean up

clean up unused code