Migrated basic multi-environment back to Barrel Strength account, simple cleanup