Cleaned for KICK command support. TODO: Add context menu item.