Cleanup for 8.4