Add debug, clean