Second clean up