some refactoring and one less request for aspx maintanance during --os-shell