Removed more JSystem infras