remove line that should only be in rate branch (for now)
Merge branch 'develop' into rate
fixed line that should be in rate