Fixed up clean-up issues