Remove id and Makefile