some code clean up and printk remove