removed few redundant lines