Minor tweaks

Change conditions for app version checking and removed extraneous test
code