feature-34: Clean