Cleaning up Git mess