Removed old helper functions.