0.9 source cleanup