Shall we add this to the general clean up task?