- removing some old out-dated code