Cleanup and Debug option