Is all the commented out stuff in this class going to be removed? If so, any reason it can't be deleted now?