Remove some unused things