Removed witnesses and minor changes