Removed old combined implementation