TextField cleanup №4