transformer cleanups after data codes implemented