refactor, remove useless buffers Upstream-commit: f87a67a3a85189756ece90cd7ac5eef2c0ad51a8 Component: engine