Removed some nasties