remove unreachable code
makefile update