Remove old and unused variables from Makefile.am