Comment out outputs and remove useless function