Removed old stuff no longer needed