Remove legacy code

drupal.org/2318927