Removed faces config. Code cleanup