From Kayant, remove some unnecessary stuff