Revert "Add tagging feature for CPD plugin, courtesy Son Nguyen"

This reverts commit bdd0275270d728eed92f52ba70e83d2c91b9444f.