Removed system-specific code