unused commented code removed