Out-dated code removed