TextField cleanup №2