Code cleanup: removed unused file
Modified the code to use the version abstraction class