Merge "Remove skips that are no longer necessary"