Cleaning up following branch merge.