removed null checks and tests