Remove unneeded stuffs