GPX layer cleanup and translation update.