remove two unnecessary functions