removed commented out code that is not going to be used