Fix: use clear_text_in NOT clear_text
Fix: Handle old clear_text better