Cleanup

 - [X] Drop Obsolete members
 - [ ] Fix some issues pinpointed by Code Analysis