Remove things that are not currently used