Code cleanup,still misbehaving in git....