commented code, removed an unused property