Remove redundant municipality, use metadatum

#6