code cleanup
code cleanup - removed android references from non-android class