More cleanup from old Maps