removed extra structs for poll