removes generation of withXXX, mapXXX and $tag
more todo refactoring