Get rid of makefile indirection
Trim nonexistent party members