Remove some unused stuff