basic cleanup for faith