cleaned up old header junk