Makefile cleanup. Samples dir usage