Merge "Remove return values from clipping operations"