Edit box cleanup