Cleaning up git with the recent changes