[ok] Removed duplicated functionality