refactor: Clear out more unused code