Moving away from noir since it is now deprecated