comment and clean-up last commit(s)