Remove some unused method