Remove debug messages.
Remove unnecessary and confusing cmake variable.
Restore originla files.
Restore originla files.