Remove deprecated methods