Changing BUSLocationService to be non-singleton