Added platform versions and made them configurable
Unused import and method cleanup