Removed superfluos null checks