[CLEAN] Remove module moved to branch 8.0