Removed old code.

I formatted these and diffed them with 1.5 and everything looks good.
Removing now.