Remove deprecated helper functions.