BRS: Post-merge cleanup