Lots
Removed old code.