removed unused stuffs