Removed some more code that was suspect.