performance tweaks, eliminate stats