public clean, exception fix