Nice cleanup there