Tried to cleanup a potential performance issue.