Cleanup and git test