Issue #220711 by FluxSauce: Cleanup and drush betterment for all