Clean-up of some code.