SMURF: Need to remove the legacy config from the Makefile too.