Removed unneeded modules from SystemInfo