delete unnecessary codes...
Merge branch 'feature-evaluator' into develop