remove version check and add helpers