Cosmetics: api clean up old code.