Remove unused stuffs