Cleaning dead code