removed missing dependency @Nonnull
partial code cleanup