Remove some unused methods