Remove commented line in Makefile
Clean up options and settings