fix: junk removed
fix: use headers only when needed