post-merge cleanup of stuff