Merge HTML cleanup and POM update