removed commented code during testing