Remove transforms from most of code