remove some custom code