CR feedback and remove debug