Removed performance dependencies