Removed extraneous file
Fixed files that were redundantly included in src/Makefile.am