Remove not required code for h* & misc stuff