remove unused
use more generic terminology