Cleanup sample data creation