remove and rename unnecessary functions