Remove some unused function