Remove debug statements
restore config files to upstream version