close #3: remove old implementation and use new one.
refs #3: enhance logging message.