Removed old commented out implementation