Remove legacy microformat support
Resolve merge conflict