Clean up code, remove T.prepare/T.prepare2