Clean-up and changed to use capabilities versus deprecated support methods