redundant lines removed
Merge pull request #8184 from FLOKER/3.0.0-wip

redundant lines removed