WELD-1291 Get rid of computing maps