Remove debug code
Update Makefile