- Removed deprecations for now as it leads to many classes impacted. Need to think again about this change.