Removed some redundant lines