I should clean up before commiting!