* treewide: remove unused variables * making ofborg happy
* cppclean: init at 2018-05-12 * Updated according to review comments