MAP-964: last one. and cleanup of some junk