Clean up
Fix multiple copies from public to repository