Removed unused legacy functions