Additional maven fixes.
Removed unused non-maven dependencies.