Removed old hierarchy