misc
removed unnecessary checks