Don't need multiple versions
Remove warns with comments