Except as otherwise provided in this Charter, all persons holding nonelective office or employment with the City on December 31, 1971, shall continue in such office or in such employment, as the case may be, until succeeded or removed in accordance with the provisions of this Charter. The offices of all persons elected under the general statutory form of government for villages whose terms have not expired prior to January 1, 1972, or whose offices are not continued by this Charter as an elective office, shall be abolished on January 1, 1972 and the terms of such officers shall end and terminate on December 31, 1971.