Issue 1483 - i enjoy removing code