Snapshot from first beta.
Missed some deletes from beta commit.