Remove some unused functions