LPS-30029 Move polls out of the core