code clean-up
Merge branch '#28/fix-issues-on-startup-caused-by-popups' into develop