Clean up dependencies

Issues were discovered using:
   mvn dependency:analyze | grep WARNING