Removing cruft temporarily to speed testing.