Removed functionality that is current, not future.