Added cleanup for init