removed commented out and debugging code