Removing old header code