cleaning up 1.5rc20