Optimize: reduce allocations.
remove unnecesary code