removed all commented code