Merge "Remove two files not in use" into nextgenv2