Some cleanup after moving to git