Property cleanup and deprecation
Cleanup public vars that shouldn't be public