removed commented out bits