Removed old, unused functions