Update Makefile

Remove use of validate-* targets