Fixes the removal of some legacy stuff