Removed prev_foc and save_ws