'dispose' methods and code clean-up.