TextField cleanup №3