removed unnecessaru things