Added services update to stormflash and cleaned up