Removed old, unused code