Further cleaning for public repo