DW: Removed commented code