Revert "Adding tag builder code"

This reverts commit 158a988ad88be7865dad070169d95788f5870d3b.
adding few changes.