removed nullchecks