removed system-specific stuff.