Remove obsolete log comments
Be environment agnostic