Cleanup for integration into GWT Maps repo