clean prepared refactorings from blacklisted case study specific identifier
Merge branch 'master' into sqlite_rename