More usage() cleaning.