removed deprecated/commented code