Remove CF 2.0 support; merge in new code from master