Bring back UnknownPlatform exception, cleanup