Final cleanup before squashing onto gxt 3 branch