Remove all commented code, please. Less code, less bugs.