Added cleanup for this context