#77 Extra cleanup realizaed -- removed logs.