Contact Template and Company Template

Code Cleaning
Revert "Contact Template and Company Template"

This reverts commit 914f46d462009b90befc392b5c146743f4b03399.
Fix Contact Template and Company Template

Code Cleaning