Update Ginkgo and Gomega
Remove dead code