removed more usages of stuff header