uncommenting for clean and consolidate