removed unused code. updated commetns.