Cleanup unnecessary imports
Updated code based on Eclipse warnings