Removed old code from this branch