remove some redundant code
some fix to hybrid collector's benchmark
update ToDo's and Finished's