Clean transformation/* code
wip