MAJOR fix and log message removal