Remove some unused whatever