drop avoidStruts and drop some apps in Makefile