Remove excess functions