Remove TODOs from old Kame implementation