Clean rh7 d8 support

WIP for comment only
@raphink how can I do to put this always at the end of the file?