Removed unnecessary event registration and comment blocks.