CleanUp. Fixed problems with StatusProvider.