Removed dependency on CLM annotation.