cleaned up some transforms
more cleaning and modifications
removed a unused transform
removed a unused transform