CB-1605: Going through Eclipse warnings, removing the unused imports