Removed unused imports and tried to fix some type issues as per Eclipse