Remove test code
Merge pull request #923 from DonLakeFlyer/VersionFix

Remove test code from new version stuff