Remove a couple snippets
Simplify gradle removeSolutions task
Clean up snippet comments a little bit