Project cleanup after merge with experimental branch.