Remove deprecated methods
Remove deprecated methods