Removed deprecated functionality