removed some commented code no longer used