Index: in-bulletin/units/poll_comments/poll_comment_eh.php
===================================================================
--- in-bulletin/units/poll_comments/poll_comment_eh.php	(revision 14318)
+++ in-bulletin/units/poll_comments/poll_comment_eh.php	(working copy)
@@ -139,8 +139,7 @@
 
 				$object =& $event->getObject();
 
-				$config_mapping = $this->Application->getUnitOption($event->Prefix, 'ConfigMapping');
-				$comment_settings = $config_mapping['CommentDelayValue'].':'.$config_mapping['CommentDelayInterval'];
+				$comment_settings = 'poll_CommentDelay_Value:poll_CommentDelay_Interval';
 				$spam_helper->InitHelper($object->GetDBField('PollId'), 'PollComment', $comment_settings);
 				$spam_helper->AddToSpamControl();
 			}
Index: in-bulletin/units/poll_comments/poll_comments_config.php
===================================================================
--- in-bulletin/units/poll_comments/poll_comments_config.php	(revision 14318)
+++ in-bulletin/units/poll_comments/poll_comments_config.php	(working copy)
@@ -85,12 +85,6 @@
 			),
 		),
 
-		'ConfigMapping' => Array (
-			'PerPage'				=>	'poll_Perpage_Comments',
-			'CommentDelayInterval'	=>	'poll_CommentDelay_Value',
-			'CommentDelayValue'		=>	'poll_CommentDelay_Interval',
-		),
-
 		'Grids' => Array (
 						'Default' => Array (
 							'Icons' => Array (