Change parent to 3.0.0 from RC and other cleanup