Projects/WIL-372
Add deprecation cleanup
Depends on
None
Blocks
None