added additional cleanup things