Removed some leftover OK properties, fix #576