Rubocop

do not merge yet, just source for discussion.
This commented code is not valid anymore, remove it.