kernel: cleanup the changes