Remove unused stuff from Makefile
Merge branch 'master' into builds
7.354