Clean-up of commented out/deprecated code.