finalise cleanup for next pr