post-merge cleanup

This shouldn't hurt anything (*hopefully*)