Fix showing of welcome screen on first app startup. Remove redundant code