remove unused codes
change the makefile