Removed old code marked with ObsoleteAttribute
Merge pull request #1308 from thecodejunkie/remove-obsolete-code

Removed old code marked with ObsoleteAttribute