Updated / Cleaned CFGs