Remove some unnecessary functions