Removed old code that is no longer needed