Revert "Revert "Clean up commented or unused code""