Remove some standard cruft. Add some contrib awesome.