cleanup and git fixes