Remove commented out stuff, remove obsolete imports

Import version.getversion ony instead of '*' import

Change-Id: Iac9cd0215f368453642ce1733d143f1706b9c568
Merge "Remove commented out stuff, remove obsolete imports"