Removed yet some more