Remove usage of depreciated fixtures