CS-5365: Fixes duplicate class errors.

Removed second files, since composer reported not using them anyway in the namespace
declaration.
Merge pull request #1 from m038/CS-5365

CS-5365: Fixes duplicate class errors.