CMS-3888 Streamline module development
Removed SiteService