remove unused code
change labels
Merge remote-tracking branch 'origin/development' into postmvp