final debug cleanup update