Cleanup, add text field