Updated spec syntax.
Remove Versionfile
Cleanup.