Moajor cleanup in makefile