FIX: Revert name of extension method and remove debugging