Removed multiple Makefile.am files that incorrectly got merged back in
Addressed comments from the pull request