Fixes in MainController imports, removes @NotNull annotations