More H2 cleaning up and back to catalog link alignment