Remove obsolete comments
Logging and code cleanup