Clean up gsmapper.cpp