Remove unused code in bin and update bin/Makefile.am