cleaning up git mess