"Clean" working version