More and more cleanup, more @Nullable, more nulls :/

The code is littered with checks for null, that sucks