remove useless codes
Merge branch 'develop' into v3quick