Removed a couple of unnecessary CF things.
Removed unnecessary file.