Eliminate dommy as an external dependency