Clean version
Revert "Clean version"

This reverts commit 6cf59ae121b9edaaa5f8615ff6decbf0c561f2a1.