Fixed issue where kernel.controller events were not getting cleaned up for RPCs