Improve unused finder