More clean-ups, should be in line with git standards now.