Clean version for testing