Code cleanup. Removed debug settings from Makefile.