Add optional removing of helmet