added additional cleanup