Cleaned up duplicate reference in pom.xml
Fixed some logic that broke when code cleanup broke some assumptions.
Commenting out seemingly unused code.