Merge "Remove leak detection options"