cleanup and sync with actual Drupal mod