Removed unused stuffs