Removed commented-out code that will very likely not be needed.