removed necessary stuff