removed some redundant lines