Clean up dependencies that should be in parent pom

Change-Id: I4fe2fa8cdcbdbb9e6b32f7bf41d6ec8041114f66