Clean up of unused code.