Some pre-1.0.0 cleanup.