Removed uneeded code
Merge branch 'master' into python_port_system_info