Removed deprecated parts