cleanup loose ends in customizations from last major EF change