[fix] Minor cleanup. Stil defunct map object building.