Remove unused code

I will put this code back too. See comment from above.