phpmd cleanup (on-going).