Fixed error message in log every start up. Some clean up.