INI cleanup

Getting ready for prereleasing 0.8