Removed unnecessary checks