comments cleanup
release cand. 2