Cleaned up legacy helpers