Latest version, no major changes. Removed dead code.