Revert "Molly - preliminary tagging mechanism"

This reverts commit 8845710b2a15a1eb8d09b98e0ff8c239a88da951.