Streamlined code

removed unnecessary class System.