Tech Debt: Removed deprecation warning