Remove unused code. Clean up code complexity.#5

patrickdappollonio wants to merge 7 commits intomainkonstructio/vault-handler:mainfrom

reorganize-reoptimizekonstructio/vault-handler:reorganize-reoptimizeCopy head branch name to clipboard