Initial commit, with cleanup.