Refactor `clear' and `manual_clear'

See https://github.com/esl/wombat/issues/784

*TODO* update doc and version