Remove needless functions