Make everything public, remove 0.7x specific types