Cleanup of Samples folder, see #10144