Delete some useless code
merge