Cleanup unused, conditions always true, etc#4361

jparraga-stackav wants to merge 2 commits intoarmadaproject:masterarmadaproject/armada:masterfrom

jparraga-stackav:misc-cleanupjparraga-stackav/armada:misc-cleanupCopy head branch name to clipboard