Removing some of the duplicated tags from modules, cleaning up build
process.