cleaning up the mess git made