Couple of unused imports removed