removed drupal stuff, added gfa alias