Cleanup old code
Renamed log file name
fix