deleted some redundant lines