removed all cross terms code, which was broken by redefinition of c and additionally doesn't capture the correct physics anyway.