Minor translation and removed old code.