removed unused stuffs
removed unused stuffs