Code improvement
Remove unnecessary version number classes, and other ...