Repository cleanup attempt #2