Removed old code that won't be reused