Removed null checks