Remove deprecated methods / function