Removed surplus imports and comments