Can all the commented code in this class be removed?