Cleanup commented code and Makefile

Merge request reports

Loading