util: Remove deprecated methods