I've changed P31 on a number of items relating to smartphones in order to satisfy certain properties' constraint violations (for the most part I've just re-added smartphone model (Q19723451) where you removed it). If you think there's a better solution feel free to change the statements further.