Remove useless call and add headers