Clean up edit controls