Internalize Clean Contact

It will make it easier for us to maintain.