Removed duplicate action handler