cleanup portal.cpp/poller.cpp