Cleanup in transform.lisp