update benchmark and remove unused code