removed commented out sections