remove more custom code