Removed old/unused code