Issue 4141: Fixing more things
Issue 4141: Remove duplicate line
Issue 4141: Kill rogue period
Issue 4141: Kill other rogue period