Remove the maps
Fix ordering