Updated availability to handle the new formatter and clean out the old one