removed duplicate code
Merge branch 'develop' into rate