Added a reminder to fix the 5.2 based cleanup routine