Dead code cleanup#4873

michaelneale merged 2 commits intomainblock/goose:mainfrom

clean-up-dead-codeblock/goose:clean-up-dead-codeCopy head branch name to clipboard