Get rid of T.create
Clean up code