Remove needless function
remove needless tests