Two more system() calls removed