Make DEBUG macro to be DEBUG_WITH_TYPE
Update TODO.txt
Remove unused files and modify Makefile to reflect the changes