Removed old array solution