More clean up in clsMap