Removed functionality that will not be finished