remove debug option from run call, remove commented code