Remove deprecated methods and their usage