Merge should be good now; Removed pollcron