Remove odd use of maps