revoved some old commented code