Change superfluous messages to DEBUG and remove dead code