remove unused code for #5