Cleanup missed items from rebase.