Public cleanup 2#115

kendraSO merged 6 commits into

silverorange:mastersilverorange/admin:masterfrom

cviebrock:public-cleanupcviebrock/admin:public-cleanupCopy head branch name to clipboard