cleanup and simplification of MapSelection module