cleared some commented code