Using commandline parameter, removed logging.

Removed unused logging, simplified.