Remove test code from new version stuff