Trimming fat off maps, server refactoring