Down to 1 check. Removed unused test, decoupled format and CSF.