Unused imports + probable bugs

I removed two imports. I add @NotNull to probable bugs maker methods.
Merge pull request #4 from StEvUgnIn/patch-4

Unused imports + probable bugs