Refactore contact and remove module for that.