Remove unused code and clean-up the surrounding area as it is distracting from trying to fix the root cause of bug 58230.