Remove some unneeded imports
Fix version check