MAP-510: cleanup