Fix issue: Removing redundant lines