removed necessary stuffs