removed header calls where there should be none