Contact system fixes, random standardization
That was supposed to be like that @encadyma.
Remove redundant files
Merge branch 'Discuss'