remove rating feature
Merge conflicts fixed