Remove some unused code
Updates to get everything building and testing with both 2.7.8 and 3.0.0-SNAPSHOT
Remove unused imports