Remove un-needed null checks...