Clean repo
(cherry picked from commit bf88b1b)