Removed platform-specific code