Simpliest code to just keep essential features

Hi Jerome,
As promised the pull-request.