Remove never passed variables