General: remove No longer necessary backwards compat code

Fixes #301