Cleared out some deprecated and unused code
fixes #147