Removing self-stutter