Removed one TODO and one dpm()