Removing unused header and updated Makefile