Tidy up the orientation service. BootLoading Services