Removed default sample-logs tool
Moved output logic back, this doesn't have to be defined more then once