cleanup tag dsl functionality and tests