Removed Redundant code. Hubs and Services are now practically 100% tested.