Simplify a bit the makefile.
Cleanup.