Clean-up of unnecessary code.