Removed Nullable annotations
A bit of cleanup