Removed some more overly useless code.