Cleaned up DAO and removed faces config