Merge "Remove unnecessary h5 selectors"