Cleanups/remove cf know