Final cleanup update #1