Remove some unused uses