Remove extra's
use htc-extra