code cleanup, removed log messages