Reverting back the version check mechanic I was trying out (different release streams), and some source code cleanup