Fixing issue with multisite urls & removing unused service