Removing cruft. Adding my standard set of tools.