More cleanup on Nexus provider
Still cleaning up Nexus implementation
More Cleanup; Filter Dispose Fix; Setups