Last cleanup before extraction and deprecation
Merge pull request #1107 from jaypoulz/master

Last cleanup before extraction and deprecation