#155 - Drupal behaviour elimination.