Remove usage and references to deprecated methods