removed unused maps as we now use lists