Fix unused imports and body problem