Removed old install-specific stuff