Makefile & cleanup