scripts cleaned up