YH-219: Removed drupal blocks
YH-219: Updated submodules