Commented unused imports and fields