Remove legacy code

http://drupal.org/2318927