Update the Makefile to follow the changes added before.
Also cleanup the unneeded files so that they are not build since unused.