Changed log to warn level, removed unnecessary code