remove debug statements, fix backup files