remove more unused code (introduced in #858)