On the commented out methods, do we need them?  If not, maybe they can be removed?