Removed old code
Removed old code