Merge "init; remove dead cruft."