cleaned up header import mess