updated kernel + cleanup
update kernel + cleanup