some cleanup
removed deprecated version check