various removals of unneeded m_wh and improved push speed