still trying clean up git history