Remove wrapper method, clean up dead code, re-factor.