Removed two lines that SHOULD NOT be there.