clean up redundant code prior to pull request, update Makefile