Fix downgrade script/clean up debug statements
Merge pull request #2080 from reciprocity/feature/save-custom-attributes

Fix downgrade script/clean up debug statements