Added poll, removed unnecessary test in read handler