Removed unused CodeGenerator
rename
Fix for tags()
refactoring towards new function generator design