removed the commented out code, since it is unused