1. add define log
2. remove unused code
Merge remote-tracking branch 'origin/poetryapps_development' into poetryapps_development