feature-39: Clean