TextField cleanup