Remove old deprecated methods