Removed old code. Still broken