Remove more issue #14 specific stuff