cleanup; break drupal glue parts out into components