minor updates to makefile, remove unneeded builtin rules