Removed header-info classes, addresses #950