Removed deprecated stuff accidentally imported