getting rid of unused code