Removed old code from before restructure