Makefile fixes and third-parthy deletion