Removed dependency on CLM annotations.