Continuing refactor
Remove unused methods