cleaning up the clusterfuck that git made
still has issues