Remove some system-specific stuff