Unused imports + probable bugs

I removed two imports. I add @NotNull to probable bugs maker methods.