Remove unnecessory functions