Remove usage of com.sun.istack.internal.NotNull