redundant code from polling module has been removed