Remove range, tweak disclosure