Remove bunch of useless code

pulling~~~