Replace db remove wrapper, add exception logging