removed unnecessary checks