Clean rh7 d8 support

WIP for comment only